0a45a53aea58309cf3e703a0e17c382a846805f5,shop/checkout/src/main/java/org/mayocat/shop/checkout/front/CheckoutResource.java,CheckoutResource,returnFromExternalPaymentService,#UriInfo#String#,316

Before Change


            if (order != null) {
                Optional<Address> da = order.getDeliveryAddress().isLoaded() ?
                        Optional.fromNullable(order.getDeliveryAddress().get()) : Optional.<Address>absent();
                Optional<Address> ba = order.getBillingAddress().isLoaded() ?
                        Optional.fromNullable(order.getBillingAddress().get()) : Optional.<Address>absent();
                bindings.putAll(
                        prepareMailContext(order, order.getCustomer().get(), ba, da, webContext.getTenant(),
                                configurationService.getSettings(GeneralSettings.class).getLocales().getMainLocale()

After Change


            if (order != null) {
                Optional<Address> da = order.getDeliveryAddress() != null ?
                        Optional.fromNullable(order.getDeliveryAddress()) : Optional.<Address>absent();
                Optional<Address> ba = order.getBillingAddress() != null ?
                        Optional.fromNullable(order.getBillingAddress()) : Optional.<Address>absent();
                bindings.putAll(
                        prepareMailContext(order, order.getCustomer(), ba, da, webContext.getTenant(),
                                configurationService.getSettings(GeneralSettings.class).getLocales().getMainLocale()